Merge branch 'master' into replace-bug
authorJohn Ericson <Ericson2314@yahoo.com>
Thu, 14 Jul 2016 19:08:00 +0000 (12:08 -0700)
committerGitHub <noreply@github.com>
Thu, 14 Jul 2016 19:08:00 +0000 (12:08 -0700)
1  2 
src/cargo/core/resolver/mod.rs

Simple merge